Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Russian translation to firmware 🇷🇺 #4067

Merged
merged 179 commits into from
Oct 20, 2023

Conversation

kobakirill
Copy link
Contributor

@kobakirill kobakirill commented Sep 19, 2023

Added Russian translation for devices. Added fonts for both black and white and color screens.
Work has been carried out to reduce the words. A lot of
routine work. Tested on tx12/tx16S
photo_2023-09-19_23-41-19
photo_2023-09-20_00-02-41
photo_2023-10-07_01-34-16
photo_2023-10-07_01-34-25
photo_2023-10-07_01-34-32
photo_2023-10-07_01-34-37
photo_2023-10-07_01-34-42

ZORRO old font
photo_2023-10-05_14-52-47 (2)

@rotorman rotorman added UX-UI Related to user experience (UX) or user interface (UI) behaviour translation labels Sep 19, 2023
@rotorman rotorman changed the title Russian translation feat: Russian translation 🇷🇺 Sep 19, 2023
@rotorman rotorman changed the title feat: Russian translation 🇷🇺 feat: Adds Russian translation to firmware 🇷🇺 Sep 19, 2023
@kobakirill kobakirill requested a review from rotorman September 21, 2023 15:29
Copy link
Contributor Author

@kobakirill kobakirill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reduction

@D4RK3R2
Copy link

D4RK3R2 commented Sep 26, 2023

i have only one ask for tx16s why :

  1. touch screen does not work
  2. The "Page<" key does not work
  3. Long key response time (perhaps this is system braking)
  4. Perhaps the RTN button refers to incorrect commands

if you can please answer me i will be really greatful

tools/charset.py Outdated Show resolved Hide resolved
@kobakirill kobakirill requested a review from rotorman October 3, 2023 12:47
@Roman-Golod
Copy link

Roman-Golod commented Oct 7, 2023

I think it 'd be useful for a lot of russian users, especially novices. Great work, thanks.

@Coffemansky
Copy link

Beautiful. The Russian language has been needed for a long time

@pfeerick pfeerick added this to the 2.10 milestone Oct 8, 2023
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for all your hard work on this, I am sure the Russian native language speakers will greatly appreciate it! :)

@pfeerick
Copy link
Member

Are you happy for this to merge in the next 2-3 days (probably the day after #4194)?

You can also add

#define TR_TRAINER_STILL_CONNECTED     "Trainer still connected"

above

#define TR_USB_STILL_CONNECTED         "USB still connected"

in advance of #4212 merging if you want.

Is there any particular reason #4195 isn't part of this PR, since this also touches on Companion translations (which is perfectly fine).

Is it ok to add you to the list to get pinged for translations (for RU)?

@kobakirill
Copy link
Contributor Author

kobakirill commented Oct 17, 2023

Are you happy for this to merge in the next 2-3 days (probably the day after #4194)?

You can also add

#define TR_TRAINER_STILL_CONNECTED     "Trainer still connected"

above

#define TR_USB_STILL_CONNECTED         "USB still connected"

in advance of #4212 merging if you want.

Is there any particular reason #4195 isn't part of this PR, since this also touches on Companion translations (which is perfectly fine).

Is it ok to add you to the list to get pinged for translations (for RU)?

#define TR_TRAINER_STILL_CONNECTED "Тренер еще подкл"
#define TR_USB_STILL_CONNECTED "USB еще подкл"

@kobakirill
Copy link
Contributor Author

kobakirill commented Oct 17, 2023

Is it ok to add you to the list to get pinged for translations (for RU)?

yes

Is there any particular reason #4195 isn't part of this PR, since this also touches on Companion translations (which is perfectly fine).

this is a separate work on the companion.

@richardclli
Copy link
Collaborator

@kobakirill You should not merge main to you branch for PR, it is always better to use the "rebase" for this. e.g. rebase a branch to main = using main as base and try to commit all changes one by one, and you may need to resolve any conflicts during rebase. And after doing the rebase, you need to check if everything alright and do a "force" push to your branch.

@kobakirill
Copy link
Contributor Author

@kobakirill You should not merge main to you branch for PR, it is always better to use the "rebase" for this. e.g. rebase a branch to main = using main as base and try to commit all changes one by one, and you may need to resolve any conflicts during rebase. And after doing the rebase, you need to check if everything alright and do a "force" push to your branch.

OK

@pfeerick pfeerick force-pushed the Russian-translation branch 2 times, most recently from 18c8e6c to f94ff65 Compare October 20, 2023 01:35
@pfeerick pfeerick force-pushed the Russian-translation branch from f94ff65 to 9e06665 Compare October 20, 2023 01:36
@pfeerick pfeerick changed the title feat: Adds Russian translation to firmware 🇷🇺 feat: Add Russian translation to firmware 🇷🇺 Oct 20, 2023
@pfeerick pfeerick merged commit 7322084 into EdgeTX:main Oct 20, 2023
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation UX-UI Related to user experience (UX) or user interface (UI) behaviour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants